Sync'd branch releases/release with upstream @ Tue Oct  7 07:14:43 PDT 2014