Sync'd branch releases/release with upstream @ Sun Oct 26 15:39:33 PDT 2014