Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 00:53:40 PDT 2014