Sync'd branch releases/aurora with upstream @ Sat Sep  6 11:21:29 PDT 2014