Sync'd branch releases/aurora with upstream @ Mon Sep 22 14:42:34 PDT 2014