Sync'd branch releases/aurora with upstream @ Wed Sep 10 16:41:33 PDT 2014