Sync'd branch releases/aurora with upstream @ Wed Sep 24 00:26:33 PDT 2014