mail traffic notice
Merge remote-tracking branch 'origin/develop' into develop
changes August 20th 2013