2014-10-10 refresh
Merge remote-tracking branch 'origin/master'