2014.08.19 In Office
Merge remote-tracking branch 'origin/master'