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