Merge tag '2014-10-09' into develop

0.0.6
Merge remote-tracking branch 'upstream/develop'
Merge branch 'master' into develop