Sync'd branch releases/aurora with upstream @ Wed Sep 17 15:21:39 PDT 2014