Make the master and 2014demorelease branch in sync

Make the master and 2014demorelease branch in sync