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