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