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