2014.6.17
Merge remote-tracking branch 'github/master'