Update dev from dev-Summer2014