Merge pull request #1304 from marcin1j/pr/20170814-mwan3-tracking-method