Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 00:26:41 PDT 2014