Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 27 10:28:43 PDT 2014