Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 27 17:13:39 PDT 2014