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