Sync'd branch releases/release with upstream @ Tue Oct 21 13:23:39 PDT 2014