Tue Dec  9 10:50:12 EST 2014
Merge remote-tracking branch 'origin/master'