Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 14:38:43 PDT 2014