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