Sync'd branch releases/aurora with upstream @ Mon Sep  8 02:28:28 PDT 2014