latest 12/17/14
Merge remote-tracking branch 'origin/master'