Sync'd branch releases/aurora with upstream @ Wed Sep 24 13:16:35 PDT 2014