Updated for 2014 Dev Summit
Merge branch 'master' into devsummit2014