Sync'd branch releases/aurora with upstream @ Mon Sep  8 00:38:35 PDT 2014