Sync'd branch releases/aurora with upstream @ Tue Sep  2 13:06:26 PDT 2014