Sync'd branch releases/aurora with upstream @ Sun Sep 28 14:49:34 PDT 2014