Sync'd branch releases/release with upstream @ Tue Oct  7 02:22:33 PDT 2014