Sync'd branch releases/aurora with upstream @ Sun Sep 28 23:26:36 PDT 2014