Sync'd branch releases/aurora with upstream @ Mon Sep  8 13:36:26 PDT 2014