event 10/22/14
Merge remote-tracking branch 'origin/master'